(rmail-convert-to-babyl-format): Fix off-by-one

error in arguments to base64-decode-region.  Remove ^M characters
after decoding base64.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 512712ec4bc3d74e03ca13e7d34775e9f3d2958c..6185fd12286d2159aa67db36619153ccbbfbc7dc 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1836,9 +1836,12 @@ It returns t if it got any new messages."
                       (when
                           (condition-case nil
                               (progn
-                                (base64-decode-region header-end (point))
+                                (base64-decode-region (1+ header-end) (point))
                                 t)
                             (error nil))
+                        (goto-char header-end)
+                        (while (search-forward "\r\n" (point-max) t)
+                          (replace-match "\n"))
                         ;; Change "base64" to "8bit", to reflect the
                         ;; decoding we just did.
                         (goto-char base64-header-field-end)